manual merge
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 6 Jul 2005 18:34:16 +0000 (18:34 +0000)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 6 Jul 2005 18:34:16 +0000 (18:34 +0000)

Trivial merge